bitkeeper revision 1.30 (3e4ce849iTXwUfd875KoO7-fEimIHg)

e1000_osdep.h, ide-xeno.c, schedule.c, domain.c, ac_timer.c, io_apic.c:
  Minor cleanups to local disc and new timer code.

diff --git a/xen-2.4.16/arch/i386/io_apic.c b/xen-2.4.16/arch/i386/io_apic.c
index 8ba37e3903ade34cec135243640afa03114a783f..878c189afbc6df0eb04fcbf8c7a54fb5906abe2d 100644 (file)
--- a/xen-2.4.16/arch/i386/io_apic.c
+++ b/xen-2.4.16/arch/i386/io_apic.c
@@ -788,7 +788,7 @@ void __init print_IO_APIC(void)
        spin_unlock_irqrestore(&ioapic_lock, flags);
 
        printk("\n");
-       printk(KERN_DEBUG "IO APIC #%d..XXXX....\n", mp_ioapics[apic].mpc_apicid);
+       printk(KERN_DEBUG "IO APIC #%d......\n", mp_ioapics[apic].mpc_apicid);
        printk(KERN_DEBUG ".... register #00: %08X\n", *(int *)&reg_00);
        printk(KERN_DEBUG ".......    : physical APIC id: %02X\n", reg_00.ID);
        if (reg_00.__reserved_1 || reg_00.__reserved_2)
@@ -826,6 +826,7 @@ void __init print_IO_APIC(void)
                        UNEXPECTED_IO_APIC();
        }
 
+#if 0
        printk(KERN_DEBUG ".... IRQ redirection table:\n");
 
        printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
@@ -870,6 +871,7 @@ void __init print_IO_APIC(void)
                        entry = irq_2_pin + entry->next;
                }
                printk("\n");
+#endif
        }
 
        printk(KERN_INFO ".................................... done.\n");

diff --git a/xen-2.4.16/common/ac_timer.c b/xen-2.4.16/common/ac_timer.c
index 45daa4c35deb89d085d9fe53152d3f21d2f6a780..b20efc94c9682f3492fd8c4043b0537c6a9a037b 100644 (file)
--- a/xen-2.4.16/common/ac_timer.c
+++ b/xen-2.4.16/common/ac_timer.c
@@ -66,7 +66,7 @@ static act_stats_t act_stats[NR_CPUS];
 
 /* local prototypes */
 static int  detach_ac_timer(struct ac_timer *timer);
-static void ac_timer_debug(unsigned long);
+/*static void ac_timer_debug(unsigned long);*/
 
 /*
  * add a timer.

diff --git a/xen-2.4.16/common/domain.c b/xen-2.4.16/common/domain.c
index 70887bfd8d5bddca71f9e8f63f329b5e44f0cb2c..f4fe13e98745b2436331317e654fa46ea26ec954 100644 (file)
--- a/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@ -580,7 +580,7 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
         unsigned char nfsroot[70];
         snprintf(nfsroot, 70, opt_nfsroot, dom); 
         snprintf(boot, 200,
-#if 1
+#if 0
                 " root=/dev/nfs ip=%s:%s:%s:%s::eth0:off nfsroot=%s",
 #else
                 " ro root=/dev/xhda7 ip=%s:%s:%s:%s::eth0:off arfle=%s",

diff --git a/xen-2.4.16/common/schedule.c b/xen-2.4.16/common/schedule.c
index 49ccc194b6e978a1b99763807ecec008aa5040c3..a1c0c406ee72360cd7095f30414d9f40ea1e2ced 100644 (file)
--- a/xen-2.4.16/common/schedule.c
+++ b/xen-2.4.16/common/schedule.c
@@ -341,6 +341,6 @@ void schedulers_start(void) {
        printk("Start schedulers\n");
        __cli();
        sched_timer(0);
-       smp_call_function(sched_timer, NULL, 1, 1);
+       smp_call_function((void *)sched_timer, NULL, 1, 1);
        __sti();
 }

diff --git a/xen-2.4.16/drivers/ide/ide-xeno.c b/xen-2.4.16/drivers/ide/ide-xeno.c
index e0ce54feed12f51dc9d0fda654378b5a2a7b92eb..d5d4bc2d8a9bb825a4747dc9b591648db19dff58 100644 (file)
--- a/xen-2.4.16/drivers/ide/ide-xeno.c
+++ b/xen-2.4.16/drivers/ide/ide-xeno.c
@@ -8,15 +8,13 @@
 void ide_probe_devices (xen_disk_info_t* xdi)
 {
     int loop;
+    unsigned int unit;
     
     for (loop = 0; loop < MAX_HWIFS; ++loop) {
 
        ide_hwif_t *hwif = &ide_hwifs[loop];
        if (hwif->present) {
 
-           struct gendisk *gd = hwif->gd;
-           unsigned int unit;
-
            for (unit = 0; unit < MAX_DRIVES; ++unit) {
                unsigned long capacity;
                ide_drive_t *drive = &hwif->drives[unit];
@@ -28,10 +26,10 @@ void ide_probe_devices (xen_disk_info_t* xdi)
                    xdi->count++;
 
                    printk (KERN_ALERT "IDE-XENO %d\n", xdi->count);
-                   printk (KERN_ALERT "  capacity  0x%x\n", capacity);
-                   printk (KERN_ALERT "  head      0x%x\n", drive->bios_head);
-                   printk (KERN_ALERT "  sector    0x%x\n", drive->bios_sect);
-                   printk (KERN_ALERT "  cylinder  0x%x\n", drive->bios_cyl);
+                   printk (KERN_ALERT "  capacity  0x%lx\n", capacity);
+                   printk (KERN_ALERT "  head      0x%x\n",  drive->bios_head);
+                   printk (KERN_ALERT "  sector    0x%x\n",  drive->bios_sect);
+                   printk (KERN_ALERT "  cylinder  0x%x\n",  drive->bios_cyl);
                }
            }
        }

diff --git a/xen-2.4.16/drivers/net/e1000/e1000_osdep.h b/xen-2.4.16/drivers/net/e1000/e1000_osdep.h
index fe3fff2af74173590cef90d8ccf1b2ca710fbeb0..259d8d8c787c01fd18f3d39429885b63bb34d07b 100644 (file)
--- a/xen-2.4.16/drivers/net/e1000/e1000_osdep.h
+++ b/xen-2.4.16/drivers/net/e1000/e1000_osdep.h
@@ -44,7 +44,6 @@
 #ifndef msec_delay
 #define msec_delay(x) {\
        int s=jiffies+1+((x*HZ)/1000); \
-       printk("mdelay(%d) called -- spin\n",x); \
        while(jiffies<s); }
 
 #if 0